@emir-hasanbegovic refactoring the binding flow