commented out test for quickness and added better error handling