Updated changes. Removed BETA mode.