build with stinaq's changes