Updated version with latest fixes