Lots of changes, but also restored original build functionality, as we need it for now