Better changes from jurre

better changes

Fixes Bug X