Trying to add some plumbs. Delays removed to better perfomance.