Added final changes for soft launch