accepted Alex' red comments