Completed implementation