2pac changes (20/40)

2pac changes