adjust according to Rara's advice