some changes after plunkr