changed style, added stuff