Working on additional features