Final changes to the code before the scrimage
Needs to be checked
FUCK FUCK FUCK