merging in remco's changes