tweaks to better support animation