worked on dist version