Options feature + Taken out of test release