Bill/Jose edits