some conceptial changes