Added various helper functions; can now remove delegates