Refactored and added better selector
Merging and pushing