further development after Eduardo