added basic features