Cleaned up to build. Using new method names.