Edit 1.0 & demo 1