Definitive version

Definitive version (for now)