Removed code to correct for Renaud's issues