Added ability to update the list on the fly