More updates of POC
fix later