seems like it. not sure why they were separate before.