Rollback of vendor
New makefile + tags