update to work on some mroe systems