merge nalin's work