some commit stuff I had left to do at work. (Abstarct extended)