latest changes; can't quite remember what I was doing here... :-(