added logs
will be continued...