Updated for version 5.0 stable