rearrangements
fixed binding bug