- adding a few changes - note, this whole project has to be reworked :-)