Splited into 2 demo solutions