dist now working as well