modified several things