updated to use new methods
.