some changes, not sure if for the better tho