maked some changes (in progress)