Adding non optimized for testing