Updating to current version with Samuel