correct the 15 minute wait time. refactor namespace