added countdown & other edits