QoL change

Will need to look to improve this in the future