Litte fix & requirement