rest of changes I forgot to commit earlier