Changes based on @gohacker's response on reddit