Merge it (fixed some problems)