Take out waiting for better testing