readded analysis' tools that got lost somewhere