#19 some adjustments