Bug fixes from Lab testing
Changes due to timing errors... not working