nicer structure for modified versions #359