major
some fix