Corrected implementation stuff