Changing to not use redirect format