Apply changes from TeamCanjica