added todo to remember to improve code