improved usabillity. Removed interface