Revert "Revert "small changes""

This reverts commit 5a55c52e78fcc670d31bb81ff5249a20a2556872.