simplified previous commit