making same changes as other user log branch