like the last commit but more right