Fixing the guidelines to follow the Waterfall style