changes from raspberry (still not working)