Maybe i can clean this up too