Added smarter stuff