Shakrah and shane

Merge Fix