Fixed scatter, added focus