Updated Beta Version