Added two options, made a lot of change