Less agressive version + list fix