Moved values into ext