added more stuff that didn't merge