* Added templates * made minor changes * Modified temps * made requested changes * Added requested changes 2 * Made requested changes 3 * Added final changes