issue 24 - final changes