changes done with joakim