actually did the changes listed in last commit; sorry