reverting back to icholy's original functionality