some changes, forgot what exactly