updated to 1-liner