fixed bug
change timer