removing setTimeout thing for now; need to find another way