Removed delays... for now