Implement simpler logic for now