Seems to me like there was a simple solution