working on...
more additions and changes