Merged with recent changes