Hayden - small change on isOk