these should be solved now