include Laura's changes from old repo