modified few stuff