improvements according to Asia's suggestions