Updated to work with the new Grmd-package