created class
Fixed merge conflicts