Added more screens