Updated based on new specifications