adjustments to port to ASP