removed animation delay that was not working
merge with master