Correct leftover functions