Now using equal rather than === for equality checks