Moving things around to reflect amoeba js