Multiple functions were missing in previous version.