*Fixed compiler error
*Tested
*Fixed compiler errors