A bit more mechanic work because I can