Added a few new, nice functions