Changed names and added logging choice