adjusting funtionalities
solve merging conflicts