update - Q1 working 100%