Changed mocing variables to boolean