some code changes to get accepted