Added a few options more options