Commited changes made by jkr07001 and alg11007