Massive code update