Update to Main

now includes losing functionality