Changes after tested on pi