fixes n merged f3renz code  :)