More work on ros integration