Post-final

Added helper functions