Suggested changes from @DASPRiD