Minor functionality upgrade