adjusted organize class