fixed bug
add timer