simplified checks - thank you https://twitter.com/alesroubicek