merge master
gtting hydro working again