Apply statman_elli changes