improvements (worst commit message ever)