New functionality and demo