some updates according to new req