Fixed everyones' problems