Some of mikes change implemented