Story 001: Fix benchmarks for speed
story 002: test
story 003: test
story 004 : delete
story 005 : add