Okay so a couple more updates :-)