To much changes... This is the beginning of version 2