Few updates to pirut :/