adding rest of changes, forgot to commit earlier