Extension of the project made in TNM066 by me and Anton Albèrt K