* Fixed timing issue
* Reformatted