Moved proxy to gateway part