Fixed animation and added input