Added some more guidelines