updated for net and code standards