few importent changes