Futher improvements