Tweaking to work without messages