Updated to single line implementation