changes that made the first tests possible in my layout