Updated to support the actual release