Took implemented enhancement off the todo list.