many changes
added make