simply refactored methods to not use inline notation to help compiler.