Some changes for adam. There's a bug! Goes far away.