Level2 small adjustments