Changes logic, will do rest tomorrow