did modifications according to the Design page