Some littel changes