hernando changes merged, deletion code added