Pencil added + bug fixing