following the merge of mainWhite.js