Added some solweek3 helpers