Adjustments to initial state and comment