finished applying needed changes..
READY FOR TESTING