Work on improving functionality