More temporary changes and addded logging