PiTiVi [luisbg's branch]