merging some forgotten indev code