Updated GA logic