Refactored for test release