nlac
several improvements
b4615d2