Changes as Per Max's Suggestions