move properties to more appropriate place