okay settled for stop gap solution, full solution not working 100%