Completed Required Functionality