Big changes commit

Big changes commit