Agree @BabyDuncan please do the changes @fredericBregier suggested