Completed Version 1.2