comment out optionalName stuff since it's not done