improved original commit