improved interface and comments