#24 small changes