finished method broed
merged with master