got rid of 'demo' suffix in top comments