Slight improvement on last commit