changed simple stuff