Completed 2007 s1 and s2