fixed issues raised by lisa