Removed eloquent, and changed some bar stuff