updated according to suggestions on #p5p