Better handling for padding for demo, renamed the demos