Few more changes as a result of changing public to boolean