Impove usability and add BSF functionality