tested on RasPi; changes...