Robert's changes