finally fixed everything