Corrected last missing piece. Something is wrong with diffs though =(