Merge Unteleported's Changes

This is an attempt to merge the changes