Added some animations and some error handling