Took out test prints/echos, added in time for query