* bunch of changes