Full logic
Revert "Full logic"

This reverts commit e8bbcb7d3a17676ec532ae51e037d9c322d85914.