Changed to boolean params where possible.