Updates per request of twoToasters team