added timer and edited text
merged