added indices and cleaned up notification