Added service, fixed timer