travis's additions (oh god)