[POC2-SD] complete all logic