Added a couple of compact functions