Additional plyr stuff that wasn't committed