Changed Address and fixed loading order