2nd commitq
some cahnges