restored original functionality