Improvements thanks to @Robotic-Brain