Few changes, added baseline (to be continued)