Added capabilities
Fixed merge conflicts