improved. pretty ugly but it works.