@aik099 yes we need to support both ways IMHO