add bunch of changes