Major changes from shawn. and AT-14 validation