updated options and functions