Updated interface & removed  silly methods