Some changes for Jirka