Small commit to fuse @craftbro into my changes

they got deleted after the conflict with the classes