[~] optimization commit