changed variable naming convention and added options controller