added breadcrump and refactoring