I think I am happy with this now