Removed js setTimeout for testing