5nd Commit- resolved issues