Updated based on online demo