Added a few extra functions