minor help and reorgnaization of order