First working extended version