Integrated with remote api
Fixed some stuff