UPDATE: Prepare for BETA 2.