Added more options. not everything works