New version with some more options