Major changes to errythan
Changed index