Second week + fix

Second week + fix