changed things to not break