Sorted out better version dependencies