Shoulder is much better. Still a little tender, though.