reverted lines to previous version: