Some changes to amalgamate methods to be consistent with the new structure of the code.