bug 1 modified ..........csdcasd