Yay stuff seems to work better now