Finishing upgrade to struts