Completed required functionality