Changed to use options