Max's changes
MERGE