Added options to make more flexible