Updated version for experimental branch