Fixing Rachel's bugs.