Max added stuff