Moved non-trivial changes to new branch