Add logging and ()