#20 changes applied with success