jaworski: changes