FIX: updated logging