Corrected functionality