sources added | a little improving