Second part of suggestions added