Final version , wit two options