update to remove 300ms delay