#1 - some changes