reduce animation time
add placeholder for one more case