Added timer and fixed rings