made a part of values. and refactor