final code changes