Modified by Vijay.