Updated branch with Robert's changes