Some modifications and fixed after domain area