Fixed wrong API use
Fixed presentation