Added more options, improved