Revised FTP to be ready before GST rollout