combined the old circular animation with this. fixed several bugs