minor changes i suppose