Improve with binding so that it properly updates.
Update build.