upgrade working - now to layout