change to object-oriented noww