Changing PICVIS to be optional