Updated some settings during the meeting with Christian