refactoring, turbolink fixing