applying some minor changes