making improvements suggested by Preethi