little unfinised update