changes names + math update