Pavel init changes