fixed up option a bit more