prepering for new features2