some tweaks
timing is ok