some changes, so fix this later