updated to change name, etc