added some basic features