ready for changinge to shiro