added countdowns
merged with pull