bit more logic for Q3 - need some research to see if there better way