Merged logic into master