End of Chpt3, add guard