cleaned up catching and added animation