Code

Reverted commits 1898 and 1899 due to reversion of 1879