changing in core organization + bug correction