Pull this code please

See note 83 on trello