implemented feature #1 in TODO list