change according to stook comment