Robert's changes and more