added changes by niki + 2 screens