untrack gen & bin + refactored and adjusted the models