Added timer, improvements