cleaned up after bartosch !