First Version (with dist)