fixed broken animation wheel
merge?