Z: now should fix the modal disapper problem..