Removed all pops of the element list and instead made index overrides