changes to integrate manasa code