tweak according to Matts comments