Adding andrew contributions