New commit with more funtionalities