First version of presentation and small client fix