revert Adam's last changes