checking in changes prior to unity upgrade