Refactoring; switched to better method.