changed some basic features