[UPDATE] Added XHR, minor changes