added all changes from other persons. THIS IS BASICALLY A NEW START!