Updated for release problems