Made it a bit simpler