revert changes since the fork, added extensions