now in 2 activities