Merge (temp deleting + debug mode) with latest version