fixing has finished, DEBUGGING!