adding some more axel's changes