removed logging - [not done]