moved delays into controller