+ added some basic features