Updated from what I have now
Fixed merge conflict