Merged in refactored code from develop