Modified modules. Added timer.