Added in suggestions from thricedotted on twitter