bunch of changes, may 10th