Newest Code with correct animation