code changes after babel integration