revert a few lines to compact version