Adjust to suit @BroganD1993 clean up