Changed to Massive; Added DAL