End of class commit 10-22-14