fixes to accomodate new logic