Fixed Up For Major Release