fixed everything woooooo