Merged with stenguns changes