Added more guidelines