Moved changes to branch

This reverts commit fd1a9e06109703fe474f1cc51f411393494f5ec9.