changes requested by Hongsuda