@jesoltech: Done both