Improved 2013 s4, completed 2010 s1