Updated version, getting somewhere