update based on Bens suggestion