some of the advice from mailing list applied