Modified for ASP
Finished merges