making it a bit more fool proof