added more 'functionality'