#4 #5 some adjustments