Shortened and fixed supplements a bit