UPDATE ! also revert some unstable tweaks and perform code formatting