Got it all working as before