Made Various Modifications