Hopefully more like a soloution