Adding Laura's changes back