Updated Engine and added comments