4/12/14 - Added some changes