More transfering from old project to clean up user experience