Added final and tested versions of each