slight interface change + doc update