Update elefrant, big changes