Added missing improvements added to current version