Completed Version 2.7