Several changes (not better however)