Added returns to everything.