applied new Bryan`s suggestions