Modify for GA

New Functions added