I Think This System Needs To Be Fixed