cleanup,
switch for animation implemented