working on additional features