edits and rick's additions