Updated it to include correct columns