simplyfy previous commit