added more combat code