second bunch of changes