Next 15 min. Commit (A little late, i think i missed one...)