Removed delay stuff