travis's additions for extra credit