Wrong operation now that logic has been changed