cleaned repo
merged different versions