Added some bugged code

Check time still not work :-(