Changed building logic.