made last commit more efficient