added focus macro