Added more control options.