options class replaced by variables
library name corrected