working, removed addons.make
minimal changes to original