More updated code.