Removing delay, Ryan's commit will have a better solution