Bugs correcting + sample