Moddified for new system