updated code combat