some changes. not exactly sure tbh