#10 - some adjusts