note to self: check before commit