Merged most of original modded stuff stuff