Continue working on this with also Thomas' changes
So I can work with the latest functions
Every first Monday of the month there will be maintenance on the server from 5 pm Due to maintenance, Gitlab will be unavailable for approximately 60 minutes
So I can work with the latest functions