Put tags back, removed logging