Merge with Baris
Version 1.0