*some minor changes