updated 10/5, prepped 10/12