Completed required changes