not consistent changes... todo: work more