Added returns after ends