removed about + simiplified some code