Sandor's changes