Added some comfort functions