Minor Logic Changes
Merge