Question from Client side modified