Completed implementation v1.0