Completed Version 2.6