Fixed parameters, added timer