added better focusing