Cleaned for merging