A lot of changes for Neoxx Edition