some more stuff probs broke something