Latest update

--Final compiled version before felicity 2014