Updated after hiatus- unknown muber of changes