amnesia: finally put things in the right place