Updated version for #6