Improve  guidelines