Made some futher improvements