fixed bad organization