Tested and refined animations classes