updated to work with beta release