Adjustments for production [Stable]
Changes for first release