Updated groove mount

Changes inspired by Brad Hill's groove mount