not super happy with this solution ( unnecessarily complex ) but hey it works