Made everything correct and stuff