made it a bit simpler