removing the -1 on final indicators, looks cleaner