some small changes from fakher