After first alpha test
Merging